Fixed alignment problems